From fd7ce447d4c958f5833f0a83f24de6c7e3e1ac09 Mon Sep 17 00:00:00 2001 From: "kaf24@freefall.cl.cam.ac.uk" Date: Fri, 22 Oct 2004 16:27:57 +0000 Subject: [PATCH] bitkeeper revision 1.1159.130.5 (4179350dKbV8Dl-DTyoBQ9c__K-pFw) Fix incorrect error path in Xen's p.t. update code. --- xen/arch/x86/memory.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c index 34eb5b54ed..30688db3da 100644 --- a/xen/arch/x86/memory.c +++ b/xen/arch/x86/memory.c @@ -401,16 +401,9 @@ get_page_from_l1e( return 0; } - if ( unlikely(!get_page_from_pagenr(pfn, d)) ) - return 0; - - if ( l1v & _PAGE_RW ) - { - if ( unlikely(!get_page_type(page, PGT_writable_page)) ) - return 0; - } - - return 1; + return ((l1v & _PAGE_RW) ? + get_page_and_type(page, d, PGT_writable_page) : + get_page(d)); } -- 2.30.2